From 8f9a1d8bf655e31472a17af859b0a8630802cb50 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Fri, 9 Jun 2006 15:20:53 +0000 Subject: [PATCH] Take GtkMenu::horizontal-padding into account when placing submenus 2006-06-09 Benjamin Berg * gtk/gtkmenuitem.c: (get_offsets): Take GtkMenu::horizontal-padding into account when placing submenus (#344290) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkmenuitem.c | 3 +++ 3 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3c2ff93832..b70a6a05bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-09 Benjamin Berg + + * gtk/gtkmenuitem.c: (get_offsets): Take GtkMenu::horizontal-padding + into account when placing submenus (#344290) + 2006-06-09 Michael Natterer * gtk/gtkrange.c: added new style properties "trough-side-details" diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3c2ff93832..b70a6a05bb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-06-09 Benjamin Berg + + * gtk/gtkmenuitem.c: (get_offsets): Take GtkMenu::horizontal-padding + into account when placing submenus (#344290) + 2006-06-09 Michael Natterer * gtk/gtkrange.c: added new style properties "trough-side-details" diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index 64dc6fb29b..ae87c05304 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1072,15 +1072,18 @@ get_offsets (GtkMenu *menu, gint *vertical_offset) { gint vertical_padding; + gint horizontal_padding; gtk_widget_style_get (GTK_WIDGET (menu), "horizontal-offset", horizontal_offset, "vertical-offset", vertical_offset, + "horizontal-padding", &horizontal_padding, "vertical-padding", &vertical_padding, NULL); *vertical_offset -= GTK_WIDGET (menu)->style->ythickness; *vertical_offset -= vertical_padding; + *horizontal_offset += horizontal_padding; } static void -- 2.30.2